Merge tag 'upstream/2017.7' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 21 Jun 2017 08:52:08 +0000 (09:52 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 21 Jun 2017 08:52:08 +0000 (09:52 +0100)
Upstream version 2017.7


Trivial merge